*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41e1ac763d49e967dfd80ab876f60cc616597211..92f174e790d11149d34c8d9e33b1692702ab08ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2001-01-25  Stefan Monnier  <monnier@cs.yale.edu>
 
+       * smerge-mode.el (smerge-font-lock-keywords): Relax submatch 1.
+
        * emacs-lisp/easy-mmode.el (define-minor-mode): Docstring fix.
 
 2001-01-25  Dave Love  <fx@gnu.org>